Merge -6 and -7 changelog entries into -6 since no -6 has been released.

diff --git a/debian/changelog b/debian/changelog
index 0e0108458d9eb767a8a584ef5aeacee6886317b5..f3b5db056c06fca1fc4b51dd6c7ae3754ec859ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-emacs23 (23.1+1-7) unstable; urgency=low
+emacs23 (23.1+1-6) unstable; urgency=low
 
   * Apply an upstream patch to fix a problem with GTK+ scroll
     bars. Thanks to Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> for
@@ -9,15 +9,11 @@ emacs23 (23.1+1-7) unstable; urgency=low
     scripts.  Thanks to Praveen A <pravi.a@gmail.com> for the
     report. (closes: #559292)
 
- -- Rob Browning <rlb@defaultvalue.org>  Tue, 26 Jan 2010 22:11:56 -0800
-
-emacs23 (23.1+1-6) unstable; urgency=low
-
   * Fix update-alternatives call for emacs manpage.  Thanks to
     Jörg-Volker Peetz <peetz@dynato-kyma.net> and Sven Joachim
     <svenjoac@gmx.de> for the report. (closes: #552565)
 
- -- Rob Browning <rlb@defaultvalue.org>  Sat, 07 Nov 2009 16:18:51 -0800
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 26 Jan 2010 22:51:54 -0800
 
 emacs23 (23.1+1-5) unstable; urgency=low